build: Rename GSK resource generator script

Maintain the naming convention, since we have similar scripts for GDK
and GTK already.

diff --git a/gdk/meson.build b/gdk/meson.build
index 05fc2af1420ad7c34cde47f1c84c82acc41ec610..08fa70c9ba7efa5d867eea773dc9c5e991aef5fe 100644 (file)
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -87,7 +87,7 @@ gdk_private_h_sources = files([
 ])
 
 gdk_gresource_xml = configure_file(output : 'gdk.gresource.xml',
-  input : 'gen-gsk-resources-xml.py',
+  input : 'gen-gdk-gresources-xml.py',
   command : [find_program('gen-gdk-gresources-xml.py'),
              meson.current_source_dir(), '@OUTPUT@'])
 

diff --git a/gsk/gen-gsk-gresources-xml.py b/gsk/gen-gsk-gresources-xml.py
new file mode 100644 (file)
index 0000000..1032d84
--- /dev/null
+++ b/gsk/gen-gsk-gresources-xml.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+#
+# Generate gsk.resources.xml
+#
+# Usage: gen-gsk-gresources-xml OUTPUT-FILE [INPUT-FILE1] [INPUT-FILE2] ...
+
+import os, sys
+
+source_shaders = []
+vulkan_compiled_shaders = []
+vulkan_shaders = []
+
+for f in sys.argv[2:]:
+  if f.endswith('.glsl'):
+    source_shaders.append(f)
+  elif f.endswith('.spv'):
+    vulkan_compiled_shaders.append(f)
+  elif f.endswith('.frag') or f.endswith('.vert'):
+    vulkan_shaders.append(f)
+  else:
+    sys.exit(-1) # FIXME: error message
+
+xml = '''<?xml version='1.0' encoding='UTF-8'?>
+<gresources>
+  <gresource prefix='/org/gtk/libgsk'>
+
+'''
+
+for f in source_shaders:
+  xml += '    <file alias=\'glsl/{0}\'>resources/glsl/{0}</file>\n'.format(os.path.basename(f))
+
+xml += '\n'
+
+for f in vulkan_compiled_shaders:
+  xml += '    <file alias=\'vulkan/{0}\'>resources/vulkan/{0}</file>\n'.format(os.path.basename(f))
+
+xml += '\n'
+
+for f in vulkan_shaders:
+  xml += '    <file alias=\'vulkan/{0}\'>resources/vulkan/{0}</file>\n'.format(os.path.basename(f))
+
+xml += '''
+  </gresource>
+</gresources>'''
+
+if len(sys.argv) > 1 and sys.argv[1] != '-':
+  outfile = sys.argv[1]
+  f = open(outfile, 'w')
+  f.write(xml)
+  f.close()
+else:
+  print(xml)

diff --git a/gsk/gen-gsk-resources-xml.py b/gsk/gen-gsk-resources-xml.py
deleted file mode 100644 (file)
index 46c06bb..0000000
--- a/gsk/gen-gsk-resources-xml.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env python3
-#
-# Generate gsk.resources.xml
-#
-# Usage: gen-gsk-resources-xml OUTPUT-FILE [INPUT-FILE1] [INPUT-FILE2] ...
-
-import os, sys
-
-source_shaders = []
-vulkan_compiled_shaders = []
-vulkan_shaders = []
-
-for f in sys.argv[2:]:
-  if f.endswith('.glsl'):
-    source_shaders.append(f)
-  elif f.endswith('.spv'):
-    vulkan_compiled_shaders.append(f)
-  elif f.endswith('.frag') or f.endswith('.vert'):
-    vulkan_shaders.append(f)
-  else:
-    sys.exit(-1) # FIXME: error message
-
-xml = '''<?xml version='1.0' encoding='UTF-8'?>
-<gresources>
-  <gresource prefix='/org/gtk/libgsk'>
-
-'''
-
-for f in source_shaders:
-  xml += '    <file alias=\'glsl/{0}\'>resources/glsl/{0}</file>\n'.format(os.path.basename(f))
-
-xml += '\n'
-
-for f in vulkan_compiled_shaders:
-  xml += '    <file alias=\'vulkan/{0}\'>resources/vulkan/{0}</file>\n'.format(os.path.basename(f))
-
-xml += '\n'
-
-for f in vulkan_shaders:
-  xml += '    <file alias=\'vulkan/{0}\'>resources/vulkan/{0}</file>\n'.format(os.path.basename(f))
-
-xml += '''
-  </gresource>
-</gresources>'''
-
-if len(sys.argv) > 1 and sys.argv[1] != '-':
-  outfile = sys.argv[1]
-  f = open(outfile, 'w')
-  f.write(xml)
-  f.close()
-else:
-  print(xml)

diff --git a/gsk/meson.build b/gsk/meson.build
index 28420127dcac59b24ec2154927c02a74d35412a7..6fc681b5e59e667a5a099fd49367833472aa9ebb 100644 (file)
--- a/gsk/meson.build
+++ b/gsk/meson.build
@@ -118,8 +118,8 @@ if have_vulkan
 endif # have_vulkan
 
 gsk_resources_xml = configure_file(output : 'gsk.resources.xml',
-  input : 'gen-gsk-resources-xml.py',
-  command : [find_program('gen-gsk-resources-xml.py'),
+  input : 'gen-gsk-gresources-xml.py',
+  command : [find_program('gen-gsk-gresources-xml.py'),
              '@OUTPUT@',
              gsk_private_source_shaders,
              gsk_private_vulkan_compiled_shaders,